modifications for fixing errors