Added better detection for Stairs