Revamped sctructure, fixed bot