Bunch of additions for testing