forgot to add the booleans to the mix