For real enhancement

Closes #14