Revert "dev b mod"

This reverts commit 50fa69439a0339d1b83affd0b9836e2003fb993e.
merged all