Fill in a couple functions