Adding more options/functions