- removed hard coded return true of enabled method