Slightly better code for 3/21