Changed to support multiple compiles