Definitely an improvement over the vanilla version