Main assembly updated