Add some messages (remove print)