refactor the database on 20140124