Me rework (6/26)

Me rework