some changes for compiling