Implement Tanner's feedback
Further editing pass