Reordered and added parts to the functional design