Adding a couple of other optimiziations