added changes from salina