- Updated functionality