In the following sentence, should I use past or past perfect? Why?<br/><br/>I <b>was/had been</b> really happy in my job until my boss hired a new assistant manager who has been making my life miserable.