Better, needs to be fixed