Yes this should be done otherwise :D