Final changes to the STD