added better controll