need to debug tomorrow