moving around functions, some deprected it and update helper