Fixed the first approach