Added time system -check previous commits