update for correct location and syntax
lots of changes, sorry