More shopt, and neater arangement