Changed transforms and updated Rakefile