improved handling