made justins recommended changes