Updated for the final submission