Modified angular decomp/iteration - seems good