changes to make it build/run for me