incorporated sebix comments on 6334a5b