Updated URL
More implementation and test cases