updated to new standard