Many modifications, almost looks like a production system now!