working update with time
cleanup
better workaround