More changes after testing the functionality