Improved on the user spec slightly.