Merge last changes to barebone - remove the not essential
repair the stop and force