added latest changes (new style)