Fixing partial feature commit (part 2)