Some small changes here