Small optimalisations + Fresh Model! :D