Updated for submission 2