Unified code

16/05/14