some changes by shumiala added and database updated