Changed so all logs to file and console