keeping everything updated before i pull newest changes