fixed location
fixed lcoation this time