got rid of some extra params