updated bradley's base
merged Atkinson's base