chnaged some stuff