made some last minute changes.. lets hope it does not crash and burn