seperated file, changed some stuff