Dev Update with moti-class