Reworking core layout