code cleanup, timestamp changed (still not working properly)