Temp rework 2

Following Pah's let's mod