AFS 1st submit version
confilct resolved