Removed redundant code
Implemented the target page