simplified some stuff