changed around some stuff