bug fix v1.1 for production
resolved conflict
add 3 edition, complete coding