Changed some info and function names