Made type changes on secondary and took care of #76