Reverted last changes. Worked poorly.