need to readd bugging to fix last thing