Automating the process a little bit more