Merged changes with zones to bot stuff