Adding in my changes to logic