Worked on omitting empty in rows