found few misses from moving, renamed 'LazyDefine' to 'NowDefine', removed spaces