Updated to not use KitDLL (not needed)