Tweaking it to compile