new fixes
merging action