WIP Fixing feature specs