chagned up some stuff