Made things work a bit more cleanly with arguments.