a lot of changes, working most of the time with Angular