Adds feature #4