more changes to make it compile