finished up angular