some changes to helpers