adding export syntax and remove