Removed .settings checking now