database added, few changes