Re-worked the code.