Some changes bug still needs debugging