Updated Main from NetBeans