added everything else I changed