Final functionality fixing 5