Added dynamic height
Merge.