1.4 and 1.5 updates

update code to match 1.4 and 1.5 versions (in other words, I've
forgtotten what I added cuz I couldn't update on time)