Legacy mechanic - Looking for advice