Changes from margarina/tadejr