Changed order for input parameters