Made changes to floor 1 to use util