added changes from yesterday