Fixed matching methods, renamed variables
null