added return false statements