Updates for spring 97+