location stuff added