Hardcore changes

Screen & logic updates