Finished up angular