Changed some methods to use entities instead of players