added Andree and some image optimisation