as said before, I think it'd be better to keep the original functions, and make the proper changes inside them