Second attempt
Some more additions