once again, minor changes for convenience