Changed variable names
Added convenience method