handling leve, added room support