Updated to reflect both .java files