merged dev version