Merged and with STAR9000621456 fixed + some cleanup for EM