Push before bringing in Kristi's Changes