Updates to initial design