some changes and started to write angular