Changed arguments and added a lot of functionality besides