Commented few problematic lines - Jay