performance improvement for non-mobile