updated again, bad commented section