Adding stuff from oct 7