Align time

@eerbiceanu -- this looks like it's working just fine. Will merge the pull now and we can clean up any issues later.