Made MagicCarpet more magical!