Updating to fall in line with pre1 spec