Modify for spec 20140828 part 2