changed data model and update homepage