Manual updates and some changes in functions