Changed few things in making calls consistent