Changes

Maximo's changes, new methods implemented and views changes