Changes from NetBean project