Full patch pb for cs 1.6