Corrected passing through data
Several updates