All comented + minor sutff