Everything seems to work as expected many changes made