some more changes for official