quick fix, need a better plan later