some updates on redoing some stuff