Reworked the original source