added some new stuff(SHHHH!!!!)