ok, let's do this properly instead