SLT-645 put back used code