updated requires
updated cancel button