Updated version for future development