Merge smart bots into gui changes