Adding my changes to austin's repo