Commit of Clear Fork branch
corrected