added fix to work with best in place, and adding dymamically new elements