added meltingwax's stuff