Changed a couple of core elements