Finished functional changes