Updated functionality