Attempt to make it compile, committed to make it available for others