changes toward compilation