whoops forgot to add
refactoring + minor changes