added changes from the main repo