Buggy final commit for fri presentation