better dev / current handling