Major fixes to simplify 4