modified helpers I guess
merged