Bunch of stuff added