Chnaged some stuff