added alex's 1.4 code, updated testing code to reflect what doesnt work