[Fixed] Moved old code