Some functional and expressive changes