added flange and all that