made several changes