Fixed Grid Colouring and added failOnComplete