yes definitely looks like that enhancement would solve it