replaced stubs so database can be implemented easily