add some changes to main (still not tested)