minor adjustments added