Version 3.5: many many bug fix