added some stuff to both methods
Merged a bunch of additions
try to commit the merge again