IP seems to be working as it should
Merge branch 'feature/IP_testing' into develop