initial

time

commited changes

Updated according to comments