Final version

Without JUnit Tests