Add Stefan modifications

Closes #3