weeklly need some bug fixes