Closed some  improvements