Finished 2

added magpie2 changes