logging added
synchronized and transition cleanup