Added locations. Possibly bug free