Added some changes for clock in clock out