committing before i start modifying all other codes