Graphics optimised a bit