updated for mechanic