Fixing up the new system, entitys