Fully implemented the new settings