Defined
Merge with biancini's code