improve performance of --devel