Refactored with Util.js