jasons changes to get it to work - hopefully