changed some stuff but commented out