wops, let us do it the right way this time