Changes until 17th July

90% completed by Iliasbartolini and Prashant Kodali