added doors and switches