Some minor change to Functions.java