Minor changes
Synced with Vertigo