Final changes before 1st SLA prototype