epic logic rewriting
work version
Merge remote-tracking branch 'origin/master'