renamed stuff for Ivo