Added entited and more work