added support for userdefinable locations and activities