0.12 five commit -> enhance all existing code