adding my current changes to core