Do it properly