Changed a few things to make it easier.