Tweaking a little on Abandonment