Added more code for comic handling