FIX AND MAKE