still tring to fix comments