added changes from latest commits