Updated to include more emotions