Fixed Bug + Added New Data