Final Version

Finally works 100%