make it global global and remove old onces