Init with code from src-2013-01-09