updates trying to fix problem with Entity