changes for fixing