Added @greduan and @ahdinosaur's locations