I made changes to the demon cs so please include those as well.