Making it work and better built