Added Location block (not completd)