Additions to previous commit