Some more changes

change db to colins still not finished have not tested