fixed time mismatching and attempted to fix issue#1