Got rid of local vector and pixmap