Final functionality fixing 4