my version of core
fixing things