Update for future development