A bunch of stuff added