Add Justyna modifications

Closes #5