Finished feature #19.