this should work better
fixed the "this" problem