Some more changes and ready to next CR