fixing UTC datetime issue - in progress