minor adjustments for convenience