Changed for version 1.1