Old changes tested. New changes added