first two branches added and working properly. Tracing not working now