Some changes but some things no work