Better, correcter function definitions