Replaced all functions