Updates to the second design