working on scaling issues