some code modification