Will probably do that after the test phase