Now use floorMaker class insead of local variable