changed so it is Thomas compatible