Edited characteristics stuff, need to add more