changed in general functions