Some more changes getting it ready to send to Josh