Assignment final updated