Merged? edit

this one should probably be merged with the PMMA