tweaked and trimmed