Update3

merge branch update3 and development