Change to 25 row as default
commit after merging with JJ