refactor(ish)
AA fix
touch