Me rework (8/26)

Me rework