fixed compilation, still wip