entities & stuff added