Fixed Location generation, changed to new constructor