Additions to the previous commit