added some parameters and extra checks