Finished enhancement #2