* Some small additions