Updates

Repushing my changes