Updated to the latest OTL layout