Added final elements, ready for presos in the cloud.