made small changes after renaming