Finishing up changes from previous commit