changing database to use ramons one
Changing count method