added some changes to system
added some potential changes