[IMP] improved + added control