Modifications based on Issue #76