Better design. Removed URL redundancy
Name changed! @TODO added.