Added more modal variables