Removed duplicate and reordered