Added some stuff ;P Bad commit name I know.
fix merge conflic