Fixed permissions, moving to case-based commands