Finished fixing up Diamond Storm