added return statement and fixed args issues