Improving defaults, changing angle method