Started final changes
Latest changes