added a bit of everything