Completed

Work as discussed patr0805