Implement Mineo's suggestions