fixing functions0