Added height functionality too