Final Changes

Looks like everything magically works.