Updated outline and moved some parts around