Little tweaking to Abandonment