Fix logic and structure.
Added text helper