reduced some code
We will deal with titles later