Worked on location module