changed alot in js models