did some extra tweaking