CHANGED: removed repeating method
FIXED: row count is now dynamic