*update graphics
*fix error
* new switch for locations