more testing! more fixin!