changed structure such that the it uses base url