r1933 + worked on ticket:40 (adding multiple racks)