Add more
Improve printing