Dirty code... lot of work to do !