removed alot of debugging