more changes to static