Optimisations and The Suprise added