Small changes
Merged with inf