merged and added room select initial JADE