Extended to accept arguments