Changes from original module