performance improvement once again