Check In & Out works properly now