worked on api and Angular events