changed; app from singleton to prototype based