Ok so I made a few adjustments based off last thread.