make some stuff more simple