master
Fixed defs a bit