added generic locations