added Setup section and merged