adding some changes including angular