Back to original code. Last try.