added changes (still testing)