Fix Organization and refresh,working