added default rows for when loading
merge branch