added more options/functions