Updated, need to fix serius performance isssues