On the spot final changes LOL~