updated syntax, mostly working