cleaned opemu a bit