Structured bit more, added dps