A little better. Still needs major tweaking