Make things more useful and less complicated.

Works