updating to include enjalot's changes in main trib repo