Changed some things but doesn't work