changing other copied code to match this project