changed fucntions
changed fucntions