modified all and prepare to test online