last changes reverted, because they didn't work as expected