I expanded the core a little bit again...