REFACTOR:
 Added location partial.