Changed location to be passed through post
Resolved conflicts