Updates to past code (more improvements)