Finishing it off properly