still fixing height change :-/