-Putting back in my changes that were taken out by Tayler's push