Simplify and add iLDSPd16