Attempting to fix 06, and adding 07