changed few signatures