5th commit: some modifications