Better entity control (incomplete)