Fixed the first method