Fixed inlclude, removed temporary functions