merged develop, fixed entity usage