Temporary hook-up of new code