Adding more details
Added major switch