Added two new small variations, removed old code from figg