err, better code