slimmed it down a bit