Improved efficiency of 1 and 2