done for hopefully monday and wednesday