update according to new names and implemented algorithms