Added Force Type and changed other things