Finished last missing bits