Changes Before Netbeans Switch

Last changes