modified some stuff in classes