Increased timeout, Added drawing + colours