Updated after syntax check