initial chnages to make it run on c9