added back some crap we needed