Correct setup file and few lines of code