Updated for the new Netbeans