added multi city support
fixed git conflicts