Further Updated part one