added explicit return statements