small changes still doesn't work