Reverted back to a more bot friendly stucture