several changes per user feedback