Dev commit: Catching up on missed time