Finished adding functionality