Changed return value from false to true