:scissors: & redefined end api