changed a bit more