adding export
merging saahils branch