Updated Jake Tools