refactoring a little bit
touch done sortof