changed design. intermediate checkin