added knife and major changes