update to try to support 2003 better