FJ Tools additions