Adds PR suggestions from Issue1