Added basic location fuctions