Added functionality 12/2