added changes from tonight