Updated version without detritus