some refactoring ... still need vincent and raul view updates