Initial changes to test the functions