Temporary solution updated