added trampoline & some more testing