Make this a little more elixiry