adjust core etc for new scene handling