EXTRACTING CLASS IMPROVED....