Now self-contained :)