Improved coueses#index