resolving remaining issues for latest changes