core factory updated & cleaned a bit