Changed to use flush and align more to original module