Measurement scripts adjusted