before Monday fixing bugs