Edited classpath
Merged my code with other code