more data passing changes