changed some stuff. Opt doesn't work...yet