fixed previous merges and added more io