Fix direction system & optimise edits