added step2 (without extra per room)