Refactor/utc

@svmehta pls check & test