xp
forgot to remove log
minor adjustments
Merge
Choose Gate