1st attempt at fixing time