Class logic has been changed ( instance to static )