Replaced Database with working version