reverted last changes until further tested