incorporated latest change requests