Final functionality fixing 3