some modifications regarding the last pull request