minor changes, now just otion detector is missing