Do it properly this time