database script
implementing new database targets
bug fix