refactor & new bots