Final commit. Different changes & improvements