Removed switch files
Merge branch 'test'
Merge branch 'test'
Changed alignment