Some updates

updated until test2