added height tags back in
merge commit