Maybe make it an option?