last commit had broken loading code. fixed