tweaked again, working okay