Improvised the implementation