chagned some stuff