added more non_stairs (matteo's)