Still working, changed defs