updates inline with timer fix

98adf8ed37b765b3129178399d62932ea117fbb7