more optemisation