Added multi screen support