Removed Comments and Updated Uri