Changed FRAME CLASS MERGED WITH CITYINFRAME