In the spirit of making things better..