added better controls