fixing merge problem with jam3 timing stuff