v.004

Re-wrote cleaner code