Merged in Mikes changes from the public test site