fixed to work with new names