still working on handling timeIncrement
still working on handling timeIncrement
merge