new fixes to make easier to work with