Time issue fixes (Still buggy)
removed end by overflow :melon: