Updated based on mcq and others feedback