Updated Location/New Module