trimmed down a bit