Updated to remove timer clock