removed time based stuff...hard to debug