did it properly this time