changes due to renaming and parameter optimization