comments and new desgin debugged