little changes and add new trace logs