Put part of Issue-73