Final Changes

Better idea than before, and finished!