Big job, lots of changes done in code, first functionalities
re-implemented