Fix Tobi's changes so it somehow exports