Updated with some EffecEntity code