Custom modifications adapted for Onefeat