Made some adjustements on 1st part