2.6 Update

Works for given examples, will need to test with more