Dark1024 commit 2