Added debugging and Expose check