Changed how cipher functions are called