Modified to the new style