Cry Havoc
Merged some PR