all first wave dev
fixed merge