replacing arrays with lists in public methods, also not returning null anymore