LongLee commit 17/6