Some changes to general functions