Refactored with JTL

Refactored with JTL