small modifications with angle added