Making certain figures work