[MERGE FIRST]Ask number of floors and refactoring