this whole section, same tweaks as above