Continued work of previous commit (non compilable)