updated dev version, will have to fix other entities