my changes ontop dustin's and ians