Akash - fixing merge screw ups with export functionality