Switching over from prototyping provider to our own solution