Change some of Tracy's code to make it compile xD