Updated logic that does not stop at certain floors