Adding 08 and fixing some 07