this should be done before friday