Comments updated
Comments updated for optionals