Splice patch
Step patch
More testing stuffs