dev

two problem