Uf 235

Looks good. Story is accomplished with these changes. Submitting pull request.