Changed constructor parameters; modified main method.