* Wave model converted to a sorf of hybrid system
* Big in login fixed