006.01 merged Rob's motate timer changes from 130424