added return statements