Final functionality fixing